Merge cherrypicks of ['ag/20806563', 'ag/20885441'] into sparse-9402666-L12400000958024923.
SPARSE_CHANGE: Iff3dd7e32914ce7b1ac7662846609c430ab043ab
SPARSE_CHANGE: I0c5d7a4f1d9ff3f9ad352da381ddf89b8a2f42d2

Change-Id: Ifd904339115712c72786aafd1d32b57a007e550b