Merge "Import Jack and Jill Douarn 1.3-rc1 as Stable" am: f6cdf063c3 am: be93eb08a5
am: b355d6f001

Change-Id: I5e6ac90465895fcd98689f02ea6b46624b279c38