Merge "Move TestAccessPointBuilder." into oc-dr1-dev