Bug: 120848293 Change-Id: Iba78ed9cffb5529ed128a21bd1732201dda7e638
mentioned in commit 1ab68207
mentioned in commit c166f447