Merge cherrypicks of [1708369, 1708706] into sparse-7343076-L53100000889266365

Change-Id: I7a911c3d5fb731cdc7c2fdd645c243baa99abbbb