Merge cherrypicks of [20101450, 20099838] into tm-qpr1-release.

Change-Id: Ifc5a1b1617c696df198b0ff36c0ac804766db705