am: 60939b9b -s ours Change-Id: I61a1292bf5a61c7b992f413955fcd3a289bf2c1b
mentioned in commit c292f4b5