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

Change-Id: Ib6c8e17b0d6664ded17ce8eb4314124eb676713c