Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am: 1e74fdb684

Change-Id: I0ccabd7441257ae1631ad8b362b64be37cf1a386