Merge cherrypicks of [5383344] into pi-qpr1-release

Change-Id: Ia7facf335d446d6843c01e10f07caa7539428f5b