am: 9fe6ad35 -s ours Change-Id: Ic6aed28ebc2620c95ec6d0b359b7f4872b0a93d9
mentioned in commit 20c7896d