am: a46c971a Change-Id: I635cfea305fb9e96f6b49c8413e798afccf092a2
mentioned in commit 38f0d53c
mentioned in commit e31c2480