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

am skip reason: subject contains skip directive

Change-Id: I4aa4df070a927b3f6cc2099ba6bbacc1fece664b