am 2481b7f3: am 4996d6a4: Merge "Remove suggested key names as its confusing." into lmp-dev

* commit '2481b7f34226e11754b933d4d93e101365e859cb':
  Remove suggested key names as its confusing.