[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 4be2deb1cf -s ours am: f62d2d750e am: 668cacd5c9 Change-Id: Ic484118eba15a1305da8362028617613f61fefc2