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

Change-Id: Iffad0c1c8dbe2b14d59951252c8e8f16c95c93f6