[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into pi-dev am: da2466a36d -s ours
am skip reason: subject contains skip directive

Change-Id: I784440f3454db036f414da52065ac6afc1f92e3f