DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 0b021d24ee

Change-Id: I8ea6ee36795edd8d45960a016346efa306a954cb