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

Change-Id: I60d2475dc2153437cb154576805c3b84fa3b2c05