Merge "Add missing return statement" into mnc-dev