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

Change-Id: I1b3189cf19e90c4bec89ab73c4a3d89be93112e6