am: 27c9315e -s ours Change-Id: Iac43a35ba34ffe48ba82f7d6fc1ecf08df2671ea
mentioned in commit 99b1b847