Merge changes from topics 'embms-cleanup-action', 'embms-download-token' am: c2f33f18eb am: 761bad1c53 am: 8f42a3a281
am: 5f48b1bc02

Change-Id: I12300a1e96b97cfa47e7ff82e2ac50e7e9932eab