Merge cherrypicks of [13151389, 13150994, 13150701, 13150891, 13151456] into rvc-qpr1-release

Change-Id: I4e89d48b8f59c8292841285cdd801a4d8f252c83