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

Change-Id: I65fd5a9c41df58cfd6cf74c23ec8d9eaa3f3bc82