[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7394043d1b -s ours am: e62681f5bd am: 9066e58db6

Change-Id: I4a4551dfa10241d9a5752864bde70a8bf1dff98a