am: d533ee27 -s ours Change-Id: I2530993e1141a7b63fe3fdaf794fa9e3f3230d24
mentioned in commit d52f370a
mentioned in commit 23e03d8d