Merge cherrypicks of [15308469] into sparse-7502182-L70000000950343899 Change-Id: I5cd592269ecc7c4e5124c651faa3f0e4cfe08d58