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

Change-Id: I1904a0394856c4428f8df78f6f8dfe4ba4d72de9