am: e0b223f9 -s ours Change-Id: Iaa99668e2e12452b8fa5c2a7c14a6129fa6f19c4
mentioned in commit 4fddf7e0