Merge cherrypicks of [2183418] into sparse-8935718-L06800000955892687.

Change-Id: I06bd8213fac98bfbecf9ae624f2214a5d99dfcf3