[automerger skipped] Import translations. DO NOT MERGE am: 2c46b65cd5 -s ours
am: 869170599d -s ours
am skip reason: subject contains skip directive

Change-Id: I56e6b16bd3bc2b4b2e4b319a5101bc29ef2cb260