am: 52bd2fa3 Change-Id: Ie85b23403fd2fa83fdcc483b59840e0d54dd520d
mentioned in commit 033a6846
mentioned in commit 2f5bbe86