[automerger skipped] Import translations. DO NOT MERGE am: 2ee5e6b596 -s ours
am: 628893bfbe -s ours
am skip reason: subject contains skip directive

Change-Id: Ibad97b6964a8e858302e6929fc687ba36d7f081b