Merge cherrypicks of [9434364, 9434203, 9434365, 9433586, 9434204, 9434205, 9433656, 9434206] into sparse-5888992-L32000000368541170

Change-Id: Idac972a57bdf312d01b358c600e6148d8f3794e9