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

Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138