Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a96 am: d974296f8c
am: b5475ab595

Change-Id: If6c24d1af51bd12ef52b546c610cb2b825c34f88