[automerger skipped] [DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791 am: 1081450d09
am: 5e7940b604 -s ours
am skip reason: subject contains skip directive

Change-Id: Iaa69c59f2373ebe8f36deea6d91df40142cd4585