Merge cherrypicks of [8048558] into pi-qpr3-release

Change-Id: Idafdd7576b5a05a593a34a5cd848c8260cf88c04