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

am skip reason: subject contains skip directive

Change-Id: Icff0865b996da193de6e60a9b7c51b6b13241e90