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

Change-Id: I2d51914ad69124eb86e1b81db4b7e3a277434649