am 12f481fb: am 5f6a8c4c: Merge "Updated to clarify division of functionality." into lmp-mr1-ub-dev

* commit '12f481fb8958846766ecbb420d5b429c72cd83eb':
  Updated to clarify division of functionality.