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

am skip reason: subject contains skip directive

Change-Id: I2eea7bf45dc2637bf8a8fd26503bbed6eb7ecd43