* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c6d8c63 -s ours am: 2cc02db1 -s ours am: 066a3586 -s ours am: ae8d6d16 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 253caed2 -s ours am: 0b1b102e -s ours am: 9498bb1f -s ours am: 1fd9c0a3 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 685b6768 -s ours am: e3bc6be3 -s ours am: bf14bb15 -s ours am: 89e90d4e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 548d2f3d -s ours am: 5eb66617 -s ours am: 869dd7ef -s ours am: e6b419c8 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 1add47e1 -s ours am: 6e940bae -s ours am: 0b08cc8d -s ours am: 20a51855 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 792935ca -s ours am: 70192b83 -s ours am: 2204f990 -s ours am: 0fe9b326 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b788c10c -s ours am: 2b189f52 -s ours am: 39358ab6 -s ours am: 63fc95e2 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef0f1941 -s ours am: dc9d65bf -s ours am: c209218f -s ours am: ba046c38 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fd9cf52f -s ours am: b162d715 -s ours am: 6a4bf470 -s ours am: 485a6e91 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8ec1f9e4 -s ours am: 1f135f4a -s ours am: b0a9fd39 -s ours am: 32c3b692 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: be89034c -s ours am: e59d8d69 -s ours am: 7487d2ab -s ours am: b85e58f6 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08ceb673 -s ours am: 9e0d6446 -s ours am: 0cce275f -s ours am: a5664e3a -s ours