am: c67266e7 Change-Id: I31481fd6996d4714f9513618515c08e5baba63e6
mentioned in commit 716f1734
mentioned in commit cf6bd330