Merge cherrypicks of [15987951, 16091655] into sc-qpr1-d-release.

Change-Id: Ic21397ede005d50caa4218f388142a32610a252a