Merge "Allow apps in /odm/app and /odm/priv-app" into pi-dev