[automerger skipped] Import translations. DO NOT MERGE am: ffccfdbe3b -s ours
am: 609548403f -s ours
am skip reason: subject contains skip directive

Change-Id: Ib789161b634c195128199a2418de03f9c4569bf7