am: 4579fe5b Change-Id: I5c5b4c17089e50faf0f2395a39715779deb74331
mentioned in commit 6e14fa99
mentioned in commit 8cdf6520