am: 550047a8 Change-Id: If049454cb120bf9507fb757a9cb5607eb528c758
mentioned in commit bce74d84
mentioned in commit 067fadb4