Merge "Import Jack and Jill Douarn 1.3-b18 as Stable" am: 09b889b930
am: a487f21208

Change-Id: I63c5a256125ddc3abb39ff3b3715e879d5b460e5