Merge cherrypicks of [9374413] into sparse-5856440-L06400000364606715

Change-Id: I5e94265d3b5173437092f8a4d4144158339f2dc6