[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6bf99a7f01 -s ours am: 870444965d am: 78c1bb1181 am: eb68be076c -s ours

am skip reason: subject contains skip directive

Change-Id: I778ae40f89f445c9ac77f2e01f69a512fd66e212