am 54aed521: am 93d45d1c: am 982daf87: am d692fcf1: Merge "Add missing return statement" into mnc-dev

* commit '54aed5215d8542e7425c107e1bcdfea2dfa0fff8':
  Add missing return statement