Fix issues with post merge refactor

Change-Id: I567f6297ace866d94f1b86b287a942e03d9a8710
29 files changed
tree: ad1013d97b0b7045d541c121a6ddbaf57e4fde17
  1. acts/