am: a3687300 Change-Id: Ic8d51c9f9264c2916b25e0a9d49c5ab017078a66
mentioned in commit b695b7cc
mentioned in commit 748e85f3