Bug: 242648940 Merged-In: I3ceefaad9b420f86e4f0b524e6f0b5649af9997b Change-Id: I04b3505c478d96f4676ec6bc3268dba24f2123fa