am: b52b6b01 Change-Id: I25a73427aca49038a7cea1df5aae8fc8b06e67f4
mentioned in commit 14abea3a
mentioned in commit c6719592