Merge cherrypicks of [2264842] into sparse-9203117-L33000000956970619.

Change-Id: I53b02e5e3917c2881d04c6296b6f376f4c7c43bb