am: 34d84d67 Change-Id: I54075b961183d73099226b5fa5a5dd75333d83e4
mentioned in commit fb64f382
mentioned in commit bba34a63