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

Change-Id: Iffb9d1533f9f3f1287122d343eb41a64ec9496f4