Merge cherrypicks of [17654271] into sparse-8440023-L86600000954025465.

Change-Id: Ie18ef54baf91974fbfe9bc45606f3f5543abdd26