This relands commit 2cd4ac8725
Merged-In: Iee63b9f53866d1f44440fed1e632549dd6b296f9
Change-Id: I903369dbad37b663a39e80149e25b0634386df6d
Bug: 274094720
This relands commit 2cd4ac8725
Merged-In: Iee63b9f53866d1f44440fed1e632549dd6b296f9
Change-Id: I903369dbad37b663a39e80149e25b0634386df6d
Bug: 274094720