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

am skip reason: subject contains skip directive

Change-Id: I36f6b869957556a717e88489fdf314f817b09ebe