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

Change-Id: I145168e66110106d358bacbd2b3e60842696c5e3