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

Change-Id: Ia7590bcabebad1db56ad91cab3367d25a7c207d6