[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 pi-dev am: da2466a3 -s ours am skip reason: subject contains skip directive am: 4c19a822 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060 is in history

Change-Id: I438a0c90c903fe615dddf4eb54e8ccaded51fc9c