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

Change-Id: I70ad180838b89444d038be9c1f9eb935c7585e4d