am: 54c3ef11 -s ours Change-Id: I342968f04aa6ba7e56e78b28ab8dfb8e671ed29b
mentioned in commit 8ef19bbd