DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 1058ca68b5

Change-Id: I1259697ab4920a027a5608545f439c26813969ab