Merge cherrypicks of [20424068, 20449082] into tm-qpr1-release. Change-Id: Ieb7c20de859b2625e6d131d5e0246bf3f551aaf1