Merge cherrypicks of ['ag/20554409'] into sparse-9380938-L19200000957686535.

Change-Id: I2577d2354b3685ff46edd51b96e0315d8eb0a45b