[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 Change-Id: Idb67d00b6ace91b47ec5e633be5c2f23942934bf
This commit is contained in: