Merge "Import Jack and Jill Douarn 1.3-b17 for Dogfood" am: 83c99be514 am: 1f9bc59a84
am: a37fa1bfc5

Change-Id: Ibc6a4e0c4a1743b7b5e4d3d75743037c37c0da73