Bug: 347831320 Merged-In: Iebec11afc62ecb79386e1866af57cd4e68461a95 Change-Id: Ia81f1e4efd5fc15bfbdace86b53e4cbf49f2022e