[automerger skipped] Import translations. DO NOT MERGE am: 76b2775eee -s ours am: 3b4c152218 -s ours
am: 31bb57db5b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd43c74b6da117af92ab6c208d6d3f9adb94bbd9