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

Change-Id: I11069259a9ccc37fcc17413188966dcc9f3077fe