Merge cherrypicks of [6075307, 6073318, 6074866, 6074892, 6072458, 6075067, 6075068, 6075069, 6075250, 6075218] into pi-qpr2-release

Change-Id: Ia42e7fbb1417f853f46a9c3f01307bc47a0becc2