am: 1a993569 Change-Id: If8ecf796d74bcd51c522952f5e100be80221de06
mentioned in commit 2ad52488
mentioned in commit 0e4df966