am: bc9b060c -s ours Change-Id: I604ad890b7bc07180aecb358bd0496276c2d5696
mentioned in commit 45c70199