Merge cherrypicks of [12960599, 12959910, 12960718, 12960387] into rvc-qpr1-release

Change-Id: I96f688a52f4d9f6f3a25404c75488a99badcfb25