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

Change-Id: I8b79fc3104b1f03b772376bf9fa02323a06e83c9