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

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