Merge "Removed mb_norm_activity_map"