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

Change-Id: I3f840c35bb7abc656bd005e4bdff90c4eadf652c