Bug: 242648940 Merged-In: I2e359e29716af5515c60ea57b554103579ca5570 Change-Id: I9c95189355453f338a6575352dc4c51ccf8e12f8