Move the default locale setting to AOJP

Change-Id: I17c9555e8d8c86dd96423baba3509c4023c3a778