Merge "Import Jack and Jill Douarn 1.3-rc4 as Stable" am: 1849502e61 am: 93e5bce1b2
am: ac94fcf184

Change-Id: I6e49a9fa24f796b975625fbed4774c77b7194b1b