Merge changes I63e93080,Iff15e216

* changes:
  Renamed string.xml to strings.xml to match Android convention
  Add UiThreadExecutor