Merge cherrypicks of [20181704] into tm-qpr1-release.

Change-Id: Ibd2e4c2cd9b0e3d7616eb3630ceb4198662977fb