am 9c0a80b8: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev

* commit '9c0a80b8f48ba3a183afff5820f4ffad29b31224':
  Fix undefined behavior (not returning a value from a function with return).