[automerger skipped] Merge "Import translations. DO NOT MERGE" am: d01f664cae  -s ours
am: f1cb8dbdee  -s ours

Change-Id: Ia5f057d1ab799cc4f4a3628798001a6f5eea93da