Merge "Embms Download setup" am: e8fb57f9a0
am: 391c7646e2

Change-Id: Ia81819ae1400d00379bd2c75ea400415afc71951