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

Change-Id: Iecd68d8bc53adb38bc1bc54f8abbcd557c67528e