Merge "Fix bug in app_id_from_name in stubs.cpp."