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

Change-Id: I124f88e13428cd5b568fbbbc62fbb841e040852d