Merge cherrypicks of [13096328, 13096329, 13096330, 13096331, 13096332, 13094554, 13094555, 13096334, 13096335, 13096396, 13096416, 13096417] into rvc-qpr1-c-release

Change-Id: Ife14e07ece63f2698fbc1007456aea787efb0c16