am 03810f18: Merge "Minor code refactor for readability." into lmp-mr1-ub-dev

* commit '03810f183a56ca3a8c1850e4ee47c89e7ea9a0cf':
  Minor code refactor for readability.