DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 1476901e47

Change-Id: I606ef750bccbcff808f929e56f705fd6e18e5cd4