am: 1a58c041 Change-Id: I681476e13bea2c35da4df646b99fb7a78bf360ce
mentioned in commit 82726c4b
mentioned in commit 504f1e4b