Merge "Import Jack and Jill Douarn 1.3-rc5 as Stable"
am: 272bdaffcc

Change-Id: I08a06fdd126b3c1be5335a35b0fde79bad1d1cc0