Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5f3 am: 9d5989df0b

Change-Id: I6ccba38eeffbdab3ef9b4e90fe269bd61aabf698