Merge "Import Jack and Jill Douarn 1.3-rc7 as Stable"
am: 1f07ed1671

Change-Id: I38811370c38208ec98a2ab778ec44d1725c6a250