am: c6be062d -s ours Change-Id: I0029f0914c21aae9c39c1fbb09e332b3d77180b1
mentioned in commit 7270036f