Merge "Embms download setup"
am: da5b77fa9b

Change-Id: I18b378fd0c999e40e3dc8cf9d1248414489880c6