[automerger skipped] Import translations. DO NOT MERGE am: 31b31396cf -s ours
am: 90a9a9583c -s ours
am skip reason: subject contains skip directive

Change-Id: I5b9ee9101153fd88a28e38c87a97489c2da83c4c