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

* commit '33cb97c0f0824f8a5f35c09db28565b076bc9994':
  Add missing return statement