DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 504da3cd12 Change-Id: I8989550146cc92e33c6438f6ba6a6ffe0df93d0c