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

Change-Id: I977c3435b758981a6fcde5532fde54a3e21c9cbe