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

am skip reason: subject contains skip directive

Change-Id: I2a4788828559bec5ca7402126eafa8eaca27fafa