[automerger skipped] Import translations. DO NOT MERGE am: 7c4390ce04 -s ours
am: 7418cf0bff -s ours
am skip reason: subject contains skip directive

Change-Id: I3934fdc05aa69c4485a0c8b82d63efa9b6f711bf