Fix merge issues from refactor

Change-Id: I373e6d8236926e6eaf298ad74b85403bae1b4490
30 files changed
tree: 238b751b248fc3f4074bfa627c7108ee9117c8f8
  1. acts/