Merge "Use test app in separate package from assistant." into mnc-dev