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

Change-Id: Ib7701dbca91ebb480efb8bd33606ec5867f0e0bd