Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: 2252c12ed9 am: b15db5dbee am: 3422a98987
am: b959b90f49

Change-Id: I61149ef077ed3fa839d524196adc459cafd7f25d