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

Change-Id: If16fa69469208147531c3144d77dbe1995b87a17