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

Change-Id: Icb84816dc98198ad6ed85dd8b030fbd0198d73a4