Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev