[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct...

[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5 am: 9d5989df am: ab6b6405 -s ours
am skip reason: subject contains skip directive

Change-Id: I9810b56bf25eca7d1ac4fcb3a40c269637c24558