Plain Diff
This merge also removes the pin for qtbase. Change-Id: If86998fb912d100cfad150d255ed41544ba1fb0c