Merge "Import Jack and Jill Douarn 1.3-rc6 as Stable" am: f2d93183b1 am: b5f4f12fcd
am: ccecd20077

Change-Id: I6e898e0fff5cf382a3fed3fd0c0a6842a2de501b