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

Change-Id: I6c8c40d8c72cc786f9c049090277956064844b11