Merge "Import Jack server 1.3-a10"
am: 8a2558b6a7

Change-Id: I3c73e671d109f71dc5c2efa8dc55eabfbb5dc7de