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

Change-Id: I40755bc35a549dae96251e8c79998784a277afa3