am: 17bcf316 -s ours Change-Id: Id895b2184f14ac2907cd7f1544db37d49e950ce8
mentioned in commit 2d86a9aa