Merge cherrypicks of [20296724, 20312491, 20450283, 20450756] into tm-qpr1-release.

Change-Id: Ic2c03cd9be97bee5b50f6455c80b40a7c4ba78ce