Merge cherrypicks of [19909544] into tm-release. Change-Id: Ie1901c5343f4038c84bbcf0e6f22af2657631925