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