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

Change-Id: Ie312c93ba991e4ac84a2239768b5cf3a27e385d6