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

Change-Id: I6951788dcc9434477f9376413b259f7b7053310c