[automerger skipped] Import translations. DO NOT MERGE am: fb4361591a  -s ours
am: 6ccb5afd56  -s ours

Change-Id: I28a1b5ffb4f3606997109e04505a5ea485b089f6