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

Change-Id: I9bca4a33851bb264f40ed49b071412c2d251b745