am: 497ae46f Change-Id: Ia419b747a76d52db737c981b01ff9073e08ef51c
mentioned in commit 3c437ee2
mentioned in commit 00118b69