Merge cherrypicks of [2175316] into sparse-8917297-L08100000955807700.

Change-Id: I15467f4e68c864b11ec41b8159566d2c6d246ec6