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

* commit '93d45d1c22d277abd182e01a7afee93b5015dbd6':
  Add missing return statement