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

Change-Id: I8f1714a55195ffe4dcdd22fd2e4e95feac1fab58