Merge changes from topics 'embms-init-fix', 'embms-download-2' am: 281edb4ebc
am: cf2b2ec7eb

Change-Id: I5b8b4985ad4201519bf5fc8b987240cde77edc69