Merge "Import Jack and Jill Douarn 1.3-b19 as Stable" am: 054267f3bd am: f547d6a7a2 am: a3a140d72f
am: 2c97760e1c

Change-Id: I222e8544a3e022fb9896aa9067f3c0d97dd49ffb