am: c7b849e9 Change-Id: I1dc3df6df666bf07bd73c218cbe21e0f592b4e18
mentioned in commit ea312dda
mentioned in commit 4c521429