Merge "Embms Download setup"
am: e8fb57f9a0

Change-Id: I5b230d22cdb8274a209f46bcc5eb2e90fb1ae5f7