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

Change-Id: I13b005c16e51d9c1d946473be6427f6bc8c5d95d