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

Change-Id: Ie3537f05ca962e94be310f8e35f38387fffc3636