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

Change-Id: Ibb42094364734dd6318b7b29bc43a17eb31c3752