[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: f9a5129f49 -s ours am: 37ddf654b5

Change-Id: I7bafc426b8b5d863f7bf8e6cbab5e9ca30ca75ab