am: c82a7587 Change-Id: I9b3a79cb507580549a8f024dc4fa6cdd38f4c55e
mentioned in commit ee045127
mentioned in commit 0b0af26a