DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: e7dbe95574

Change-Id: I53c56f0ed9243e3327086b8ef501bd479ea5c92f