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

Change-Id: I6f44eee532048033af8e0c9305f41958f5354bd6