Merge cherrypicks of [7444491, 7444492] into pi-qpr3-release

Change-Id: I25bf6d45138576b2318d295679878cc6cf8f9c2f