Merge "merge from master" into mm-wireless-dev