Merge cherrypicks of [16090406] into sc-qpr1-d-release.

Change-Id: I53c838fb447e1e3ef5ac0d03de7353e6fc8c01ef