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

Change-Id: I91275a65acf82578cb046a487a453f6165b99466