am: a1969109 -s ours Change-Id: I8769c374dc5f12d8b9c696e8498e4454710b5da1
mentioned in commit 367f2a03
mentioned in commit 3f9c9739