am: 19c9233a -s ours Change-Id: I96e07b1d8a13c17c1b7c95edb584e76cdd01a781
mentioned in commit 6814f3d2