am: 667b285a -s ours Change-Id: I5f379befa5fa7449fd410c76f1ec8d8419c2928e
mentioned in commit a2d71093