Merge "Update the use of registerAppInfo"