Merge cherrypicks of [16207304, 16184350, 16417864, 16366977] into sc-qpr1-d-release.

Change-Id: I92360aabf03443fb9333e210c3e9f98b6b52ff41