Bug: 23419062 Change-Id: I7e7cc79f8737efc521e6ac35479efd13338aa0f4
mentioned in commit 1e1912e8
mentioned in commit 79a149ba
mentioned in commit 9829a9c5