Merge "Fixed bad auto-generated method name." into mm-wireless-dev