Merge "Revert "Import Jack and Jill Douarn 1.3-b17 as Stable"" am: ca8559d119 am: c4cf82186a
am: 6a09d16691

Change-Id: I5a2600d5f685566cdab5b21a4e3d5e8691deee3b