Merge "Import Jack and Jill Douarn 1.3-b20 as Stable" am: d882a0a427 am: 426eca9dad am: dee5590f50
am: d939a3a055

Change-Id: Ifded7074f8321443477763de63fc1c9f4168b784