am: c8bcfc6d -s ours Change-Id: I019187584f69a88d4651049aef65bed2bfd8119e
mentioned in commit 2b486c25