[automerger skipped] Import translations. DO NOT MERGE am: 5fb899d15b  -s ours
am: 4385f02221  -s ours

Change-Id: Ieb0d6919dd3ccd5af73bacf9fea07fb6995c8f2d