am: 4eb7e222 -s ours Change-Id: I26c1a4a9747ea0954bd4983a3212f3250839dcd9
mentioned in commit 422e37aa