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

Change-Id: I795a9504ea8873999aff1aed5ffb508787a903a1