am a2130c88: am b627b39f: am 7401001e: am f2e380d8: am a099d718: Merge "Some minor code cleanup" into ub-gmail-ur14-dev

* commit 'a2130c889800107d4fd41c3bb9c03d8d3d88bcb1':
  Some minor code cleanup