am: 8e0f7c5a Change-Id: I26631b37ce2ed2fd8651e644334d357c2437adb7
mentioned in commit 3ba7fa92
mentioned in commit 4ab6bc23