Merge "Add locale testing to teeui" am: 9f8377b975 am: 27f40f8a74

Change-Id: I6f57293ec838642450e3af8333a53eee9d173128