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

Change-Id: I4751be639a2aed54869b6fb50a0d3c7567d4e234