Merge "Import Jack and Jill Douarn 1.3-b14 as Stable" am: d0935d86f0 am: f078c2031b
am: b7123504ec

Change-Id: I567c8dcd07ad31fcd8ebfc0819f3b8ec147fab62