[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 52359d0baa -s ours am: e4d837b145 am: 3a6c0ef502

Change-Id: I47452575cc10bebc1fed5ca9a5974249d805dd02