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

Change-Id: Iae76ed3482f427546053de7a57fcb12806c360f1