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

Change-Id: If3dec0dd1f15fbdb810679e934548b9f0ff06019