Bug: 151672459 Test: Manual Change-Id: I839921021d99ffa5c00d4a9dbf9c4c3d31baf855
mentioned in commit 0c276125