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

am skip reason: subject contains skip directive

Change-Id: I718339de56666d04d4932a2695882b330aaed44a