Merge "Revert "Import Jack and Jill Douarn 1.3-b16 as Stable""
am: 0a576103f3

Change-Id: I811913578ad645081aba50c5bcf16487efb44595