Merge cherrypicks of [20329525, 20329226] into tm-qpr1-release.

Change-Id: I204f2c5e40ce2f2164ac71a85b90f2472541ba45