Merge "Prevent system uid component from running in an app process" into mnc-dev