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

Change-Id: Ic5a4d3eddb333e9f2238085fd07b2571c7ae5a57