Merge cherrypicks of [2157797] into sparse-8841113-L64900000955518334.

Change-Id: I425b7c526ea0c295e5fb5a538a49bbb7a9bbe209