Merge "[NS A11] Small refactor"
am: 39a3f236b6

Change-Id: I317e6b99a51ddb0a3e49b08c595eb42f4edad1e9
tree: c16b7f6d5c3c2026b50b967415ca57c565bd8e71
  1. core/
  2. services/
  3. tests/