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

Change-Id: Ia98f71f7acb222aee41e63822a71fa2d0747a183