Merge cherrypicks of [17526464, 17526463, 17506192] into sparse-8320097-L09100000953927929.

Change-Id: I38d8f173d927132b7c6410aaaa61784ef2763b6b