Merge cherrypicks of [17654991, 17654992] into sc-qpr3-release.

Change-Id: Ieca77df617d9ba2afa01ddd3ed243a4128dd7852