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

Change-Id: I785b6c28631582cf5976cd9fc14161684f9779de