am: a7cab23f -s ours Change-Id: Ia11e9d18517a925324122398006f029a7081a00f
mentioned in commit 5c1e4908