Merge "Set Jack and Jill Douarn 1.3-b17 as Stable" am: cb0e43a6f2
am: 9d4ee24bd0

Change-Id: Ic5fbd6e5590b83b97ded406a6e13bceedd2f0bdd