[automerger skipped] DO NOT MERGE back porting for fixing sysui direct reply am: 08aae90860 am: a37fe87922 am: bf965b484f -s ours am skip reason: subject contains skip directive am: dec51767c9 -s ours
am skip reason: subject contains skip directive

Change-Id: Icc516d8aa87f24084cf3c7053bf260357ccbc72a