Merge "Extended system_codename and Interface name"