[automerger skipped] Import translations. DO NOT MERGE am: fc8af23e97 -s ours
am: c3f22a4c2d -s ours
am skip reason: subject contains skip directive

Change-Id: I260e894a14bd59a487d3a9fd7468462994b9a379