[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d742a0de21 -s ours am: 32bce2cc49

Change-Id: I68a8bff412fde46b4a4819e3231cd3d76e5dec4f