Merge cherrypicks of [15738806] into sparse-7698606-L95500000952403884.

Change-Id: I4975f37246b2bbf7b136a63f601dec84d61e0865