Merge "Import Jack and Jill Douarn 1.3-b6 for Dogfood" am: f07f80c005
am: d3b4238671

Change-Id: I117dae8153433e71c51406abfadf7757c2426d0d