[automerger skipped] Import translations. DO NOT MERGE
am: 5ce016b525  -s ours

Change-Id: I188468ee3a9fd2942431a00e909aa93122960336