Merge cherrypicks of [2188504] into sc-qpr3-release.

Change-Id: I8b106e072c3e80fd13275972023c08e69b309a00