Bug: 120848293 Change-Id: I970e7d6e88c071ed815169f3249965d490dca2d7
mentioned in commit e1f1c82a
mentioned in commit 53add29e