Merge cherrypicks of [7293852, 7293854, 7292377, 7293923] into pi-qpr3-release

Change-Id: I0ac98c944c5d4834f7a362b6855ce09a1455299f