Merge "Import Jack and Jill Douarn 1.3-rc6 as Stable" am: f2d93183b1
am: b5f4f12fcd

Change-Id: I691186fb612a988c0d22ade51d03e53cb4637363