am cfdeb9b0: Merge "Stop using Configuration.setLocale"

* commit 'cfdeb9b04bd1646e97973823fd9d4fb5dee09681':
  Stop using Configuration.setLocale