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

am skip reason: subject contains skip directive

Change-Id: I6303ef0744d0c9d2247dc8b55f4ed75d91ca75fc