Merge "Import Jack and Jill Douarn 1.3-b17 as Stable"
am: e3a29c5e1d

Change-Id: If113415860d26047a2aa9e643e746ea55d1cf16d