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

Change-Id: I1c2e7366e60cbaedfbe74ed414e9c15248054afe