Merge changes from topics 'embms-init-fix', 'embms-download-2' am: e601160a am: d974296f am: b5475ab5 am: 1a47b934 Change-Id: Ic67525d9ffe4074f981bb2832ddc9226ce19e5e2