Merge cherrypicks of [17416116, 17416117, 17416118, 17416119, 17452466, 17630873, 17880725, 18030449, 18298311, 18321334] into sc-qpr3-release.

Change-Id: Ief5832b73bbc91664969a62794aa2be1c8e6902a