Merge "Put back Jack and Jill Douarn 1.3-b17 as Stable" am: 2d617a5f0d am: cf23cdb68c am: b294b50dd8
am: 97ba870b52

Change-Id: I3a142f6fb53c09e34a5f21b3e446a7db4b4f17e9