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

Change-Id: Ic5b84e6b650b01d38801a2ff39c059a51173fe0b