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

am skip reason: subject contains skip directive

Change-Id: I37765b441c67acd06de9e9699baeccb013951284