am: 1c8d5882 -s ours Change-Id: I21144526c5871aaf32a6327355b18b27c733ad05
mentioned in commit 974532cc