am: 85e4f9b5 -s ours Change-Id: I9143b0c12fa27ecf039ae7f5faaf32b1ca568ff8
mentioned in commit b36a6a3b
mentioned in commit 253f7771