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

am skip reason: subject contains skip directive

Change-Id: Ic52932d487a595fc2f9f46e1bfbb71f808ec4dc9