Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev