Merge cherrypicks of [19122700, 19341499, 19366451, 19302198, 19416132, 19346143, 19518999, 19491365, 19117572, 19565636, 19600072, 19601344, 18555351, 19570391, 19415033, 19416449] into tm-release.

Change-Id: Ia5c963d8bc9a6deddbbae5aba368f271bec99a04