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

am skip reason: subject contains skip directive

Change-Id: Ie2bd40473375c593fbbb17100b1474d9c8fe20d3