[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 am: 13003620 -s ours am skip reason: subject contains skip directive am: 3b8b2681 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060 is in history

Change-Id: Idfc9a676a9f80381b8d85b3d3f4db6c8d82350ba