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

Change-Id: Icd12cbea5fe0c918c17956cdc965e4032b19fa3e