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

Change-Id: I4d0c5bdf8a303ebf17ca17661aa33d27b617455b