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

Change-Id: Ibdad27e280d18347641f82a9d28be8ec32718944