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

Change-Id: I0b3e2a530b390715bb53e5597619d2c662bfcc1c