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

Change-Id: I6cb793f00ee033a44ed36ba84649fb07bc73c041