[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 93db1979ff -s ours am: a32cf1a74e

Change-Id: I60b54eb4f13e5d420c8bdeeb352819c18636348c