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

Change-Id: I2e5f8a7d63dc2f0a691b767c53357713d8fe2c45