Merge "Import Jack and Jill Douarn 1.3-b17 as Stable" am: e3a29c5e1d am: be3b47d1e4
am: a52cbfe34e

Change-Id: I51d330d32e21717a082abecf7aab2dbf2885d18f