[automerger skipped] Import translations. DO NOT MERGE skipped: faed2889f4 skipped: 091681e295
am: 4228af93a7  -s ours

Change-Id: I50958128b0b470ee8d2a3ba83660172f210069c0