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

Change-Id: If549c08de119474ac12c683f72c0f8bfb0fd777f