Merge "Import Jack server 1.3-a9" am: a8671f94dc am: c1b0bc0ee4
am: 4b3440dc32

Change-Id: I177637990ff78eb4ac2486192cf75a125d303ee5