Merge "Import Jack and Jill Douarn 1.3-b16 as Stable" am: 760a6e1609 am: e36dd7b2f1 am: 80a7561123
am: 8a9c9c554b

Change-Id: I51eb87066d8a6b813f1b4c777274765d6bf2d4d0