am: 8ee02968 -s ours Change-Id: I2ef7e3ff24f1e2caa55750510a467cb96fe86f51
mentioned in commit 284de469