DO NOT MERGE back porting for fixing sysui direct reply am: 08aae90860

Change-Id: Iebebd941ee806b4e06d35f2134113f609160396f