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

Change-Id: I6693dfa7313fcc19acb94e9ccb10f85e92c4b2ab