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

Change-Id: I6be44581604b9e1d540a4b1c868f7b87fc1e2462