Merge cherrypicks of [5316628, 5317104] into sparse-5052819-L66800000220839881

Change-Id: I6776d65c54fba4d553f809131c77e0ee679c0140