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

am skip reason: subject contains skip directive

Change-Id: I46aa2ac52f3a87a65f62e56bcf4f1e58723ece8a