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

Change-Id: I7625defdce4fb4c69355f45d801729828646e659