am: a7d38cd0 -s ours Change-Id: I166bbba6e294d165a3e3295223eef8564e531d45
mentioned in commit efc6681c
mentioned in commit 7184cca9