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

Change-Id: Idb1a96f8694fd679ed020d4b4b14a4571becb414