Merge "Import Jack and Jill Douarn 1.3-b14 as Stable"
am: d0935d86f0

Change-Id: Ib69b90d00f1b7e3a33ec18c71594a18f3dc5e979