am d8dfac6d: am abf05cc0: am fdfe73ff: Merge "Use more descriptive names for some internal fields" into lmp-dev

* commit 'd8dfac6dcb16f01bb20c7e1ed669b981835a2e1f':
  Use more descriptive names for some internal fields