Merge cherrypicks of [19042674] into sparse-8762339-L68000000955468217. Change-Id: I80be442e3e1cb2da2f68cda68bea7aad541f6177