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

am skip reason: subject contains skip directive

Change-Id: I5936c387c7ec838981a31cb62923dcee81d68fe2