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

Change-Id: Ie14bb69dd5711b33a6250a2811dcf09c429dd018