Merge cherrypicks of [20124955, 20131744] into tm-qpr1-release.

Change-Id: I41e61a03e8b7712cb057dbdc4818fed96e496c5c