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

Change-Id: I920338160409cfc26d7ea2de2a3c171069601b35