Merge "Various updates to match spec:" into lmp-mr1-ub-dev