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

Change-Id: I40ac9866f13f0ab233894b855b0786a322e3d56d