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

Change-Id: Idc67436be3115f34b3ffa1131d52e2519b87701e