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

Change-Id: Ic2560bf550ecc71e1fd088390430b97a9e8a8ee6