DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 6944fb1eab

Change-Id: I8545c7b9e3db9a0e309c8f923fd2fadf73bb2b0d