CP from the AOSP aosp/2200280. Bug: 244524317 Test: NA Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c Merged-In: I9259596811cba08a21b78eebbe2f847e1aa6818c
1b9a21ffb5