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

Change-Id: I77c93837447c0fed90d9d13e1676f76c86941647