Merge "Revert "Import Jack and Jill Douarn 1.3-b16 as Stable"" am: 0a576103f3
am: 4d8fd0a0b6

Change-Id: I2c14ace244e778f1d28435d4b9ccdd32f2c423b1