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

Change-Id: I3c25f0a0d3dcfa134ed7b8e6357b175648a541f1