Merge cherrypicks of [15822021, 16381902] into sc-qpr1-d-release.

Change-Id: I6fb8fd1d14d94e37719a6ee8d1e1ad8647c75761