DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: e4776a4157

Change-Id: I7ce3a87812626955b8f5de140457717ded58c00d