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