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

Change-Id: I10a55a93071fe9dec8fdcae89ccd791368a651a7