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

Change-Id: I0cfa4ec83963598b9413ecbf929c86203c89e6fd