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

Change-Id: I7e9613f9a55d5424abc9c92914585768c4cd8757