Merge cherrypicks of [2132192] into sparse-8743395-L82100000955184380.

Change-Id: I0134c50787000e55fa050282b9b0ccf3e902ff70