am: 2e8d208d -s ours Change-Id: I1e6f071079f60d4e8a95c83a9e280e9898c6501a
mentioned in commit e1275744