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

Change-Id: I30918c270ad72018090af22a52cae798df7411fe