Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I354a7ee839c33558f86a0b776f87a2f31c96f5d2