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

Change-Id: I17869a340ab5880f7876958b1b291d9425baf40c