Merge "Revert "Import Jack and Jill Douarn 1.3-rc1 as Stable"" am: fab98ea84a
am: 725b88b77f

Change-Id: I04b010976c0f1d07837ede3d0eafa3d0c8c65f83