[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: af9f134d87 -s ours am: 58fb647cd9 am: 46437f55f2 am: 8443f1081b -s ours

am skip reason: subject contains skip directive

Change-Id: Ia64853311197ef4267e5009c1ab22b6bf594f0b2