am: 03abc1d1 -s ours Change-Id: I723a3a392b25d615774a5aef6db86d07a02a2110
mentioned in commit d55b8fbc
mentioned in commit 71a54e6b