Merge "Updating CPP ActivityManager interface to be one way" into udc-dev