Merge "Set Jack and Jill Douarn 1.3-b6 as stable" am: 18c9d22058
am: 85e377b1ee

Change-Id: I32fb83ef6a2d14716db7846c493cd68c806affca