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

Change-Id: Ic88da53e4e8d4793108e04dac2de62bc0f1560ab