Merge cherrypicks of [16375908, 16371979, 16308034, 16375906, 16148688] into sc-qpr1-d-release.

Change-Id: Idf4f77f0613245cf4b5a4684646ecb9de3f1338b