[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply...

[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am: 08aae908 am: a37fe879 am: bf965b48 -s ours am skip reason: subject contains skip directive am: dec51767 -s ours am skip reason: subject contains skip directive am: 5166a0a3 -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060 is in history

Change-Id: Ie592ed299a3138b0c440810e4dc51ac2c4861947