Bug: 142003500 Change-Id: I3a6d6b2acc35d3f06258b648e192943a7e62f660
mentioned in commit be4da517
mentioned in commit 63a016d9