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

Change-Id: Ib3cd3fcbc4321b2a75c10a146889f1f28fef7b44