[automerger skipped] Merge "DO NOT MERGE back porting for fixing sysui direct reply" into oc-dev am: 090476d5f3 am: 9d5989df0b am: ab6b640548 -s ours am skip reason: subject contains skip directive am: 1300362067 -s ours am skip reason: subject contains skip directive am: 3b8b2681aa -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: 4536e07966 -s ours am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history am: 891f3708ad -s ours
am skip reason: Change-Id Ie3daecd1e8fc2f7fdf37baeb5979da9f2e0b3937 with SHA-1 33f56060d5 is in history

Change-Id: Iaeb8c17556b0f227bc5dc278d439f3d150ad889f