[automerger skipped] Import translations. DO NOT MERGE am: 2a04a34ee7  -s ours
am: a244f80898  -s ours

Change-Id: Icb287f1dfd3ffba060a077cf745a7854512578d2