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

Change-Id: Ib251f6329f588851d640a57fad839bf6220529c2