Merge cherrypicks of [7324446, 7324447] into sparse-5501617-L80600000307420414

Change-Id: I16ab8f30806af570286cacab4a2699d825ef584e