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

Change-Id: If59db86320512782bd9e4a3d8f048e0f6a0d1c8b