am 35abe50d: Merge "Keep existing API behavior that regressed." into lmp-dev

* commit '35abe50d89e8dedecf6a3c66c3b6bfe9f904528d':
  Keep existing API behavior that regressed.