am d692fcf1: Merge "Add missing return statement" into mnc-dev

* commit 'd692fcf115e57fef8a15c214fb2fcde78a48b45c':
  Add missing return statement