[automerger skipped] Import translations. DO NOT MERGE am: b54c147e27 -s ours

am skip reason: subject contains skip directive

Change-Id: I484407209b8b890c8109892d163c320450f48c2b