Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
am: b60be94644

Change-Id: I8010ba014592e8bcf6a9a07b68842c1ff93a217d