[automerger skipped] Import translations. DO NOT MERGE am: 942cf4962a -s ours
am: 9fa066742e -s ours
am skip reason: subject contains skip directive

Change-Id: I8b151b94fcd15d4efdd241cb2fec03d159d809c1