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

Change-Id: I03013c0a5389e6be8a7ebdaa17133c5e040a485a