Merge "Import Jack and Jill Douarn 1.3-b10 as Stable"
am: 2d27074efe

Change-Id: Ieed045396e7486001add51fb5c22ee18c0b48695