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

Change-Id: I397499db9e3f31b1601e3de2f7e942c55a35bd05