Merge changes from topic "gpuprio" into pi-dev am: 7eeb0eb6d3
am: 89a0cc2406

Change-Id: I8cc93b1d10c4d3d80a0ded5559ccd2304551d2ab