Test: manual Bug: 220144337 Change-Id: I2d389d71dd9402353b058039464495a1d33ef0e9 Merged-In: I2d389d71dd9402353b058039464495a1d33ef0e9