Bug: 120848293 Change-Id: If72428d426199fb2c6124ed1a6c9334acb138327
mentioned in commit ac290308
mentioned in commit 3ef6518b