Merge "Import Jack and Jill Douarn 1.3-b7 for Dogfood" am: ccc9bd8c29 am: d0bc3fc126
am: 6e73f19e3f

Change-Id: If4b09bebe3191fc62b6cde6c934f5194eebfbab1