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

Change-Id: I86d7f5f928609733102645472076e9aa6d9fb740