am: 38171eef -s ours Change-Id: I65cf7998498c6f0eb526bfeccea7a9e8115a1f8f
mentioned in commit be08386c