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

Change-Id: Id9a4d04916e5477cf5aa30a4a3f4e4d5feb56063