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

am skip reason: subject contains skip directive

Change-Id: I017e37d3558f05efcd9e801d8df05c9ae004dab2