Merge "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master" into stage-aosp-master
am: 76b2ca4bfc

Change-Id: I6e88f6b9dddd8d93ff50a2a41f972791c1a888a8