Merge cherrypicks of [19829996, 20026353, 20104719, 20111891, 20119800] into tm-qpr1-release.

Change-Id: Iae7a7663fec2247d8cccb98e048c06ea6b5010df