am: 8ba86320 -s ours Change-Id: Ib9ce60f09c59560dee237dc0094ffc5ef20a8b75
mentioned in commit 3dd4b178
mentioned in commit 00c9d2c9