am: e3c17ce4 Change-Id: If3a793437f4fe2c3bedfcf176dfca4d0fecbb463
mentioned in commit b0ba9b90
mentioned in commit cf68d9fb