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

Change-Id: Icffece429ddcca704b7d2e5f62d3a3296b09954c