Merge "Add provisioning extra definition to skip education screens" into qt-dev
am: 986f1f4e5f

Change-Id: Ic492062a6fd629897fceaf808c4a72335c2c8190