am: 0a70bff2 Change-Id: I3f62907d43867914f5062beb817ad7555514bf98
mentioned in commit 550162e0
mentioned in commit a7f063ec