am: 519ee58e -s ours Change-Id: I6ea09ba6a83d530d22a8cc0519fd6bdb4a3688d5
mentioned in commit 34e5d928