[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 0c99e26e4d -s ours am: 121f9642f9 am: 4be78b6e1a

Change-Id: I99ed571257ca79d7465f3b7f3bc7d067c3cc10c5