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

Change-Id: Ic386d78db7972877d9e2bff059d7f05acd00f2f6