Merge "Remove wifi MAC addr access test" into nyc-dev