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

Change-Id: I24dbae532b5b6f54cb2e674b73a93b0542bbcd51