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

* commit '5e32ef30b17ca68a30179262c9aae5287406e338':