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

Change-Id: Iaee59bb643c75b420617920cde6e8ca0683e6153