[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: bbe5c3a814 -s ours am: dde1895442 am: 92b00f5408

Change-Id: Ie6407668f0fa0c38755ec6a05e4ddab5ccfc85d6