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

Change-Id: Ib66d554f5b3050a5f461928f59e1f59e34a4db01