Merge "Import Jack and Jill Douarn 1.3-b20 as Stable"
am: d882a0a427

Change-Id: I2d6121b017f7117cf4b92a06329be7471eb81a70