Merge cherrypicks of [14194721] into sparse-7281572-L18800000859538429

Change-Id: Ied27c26ccf09a82765f55b018445140e7132fcd2