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

Change-Id: I21fee1eb2f7e08ee457c3f85cc53cf699766e268