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

am skip reason: subject contains skip directive

Change-Id: I23c7477d1ffb63b2605301fbdcc6345a4ebd793c