[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 67d7a595c7 am: 9d5038057e -s ours
am skip reason: subject contains skip directive

Change-Id: Icc7b36299c5f6104ee8bd89a83f937798a2441ef