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

Change-Id: I331bc663372b07af495250ed314456f4644535e3