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

Change-Id: I99c1729a5a73d4948c7996d68c47923008604afa