am: 8366d47b -s ours Change-Id: I9adec2ec404c8a4412ce8b1f1723b37da0107bc5
mentioned in commit 82090a3e