Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev