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

Change-Id: I0fd5dc36d63945864a028fcd6669ad9547ad0db1