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

Change-Id: Ieac03722f88ab52da50bdc63cc87331f7147f1b4