Merge "Import Jack and Jill Douarn 1.3-b15 as Stable"
am: 5a3fb17474

Change-Id: Ib5da55a2d084afdb1a4fda1b3ce6bc8915ba2447