am: 4a87753a Change-Id: I6ba60693c25167c9ab43a34eecef57301234a64d
mentioned in commit 461e49c7
mentioned in commit 682f22b3