am: 0a51f7dd Change-Id: I30ece9426338a682959830fca82b9d7c4994f614
mentioned in commit 777c5702
mentioned in commit 5acc0e33