[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2bf8cb6fba -s ours am: b07e37f3ab

Change-Id: I867a1571e19ddf7ba6807a8d55c0867f5a1fe813