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

* commit '982daf8769bf78dd6bb240dab9ac7d0a62de21cc':
  Add missing return statement