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

am skip reason: subject contains skip directive

Change-Id: Ic45ec3085cd4d6313ccdb5d6ee364debec129e5c