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

Change-Id: I8d644983776fda331a577ab7791c5187374600b6