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

Change-Id: I055d116681df8a429171ceb2268bf71fd0a05203