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

Change-Id: I1df4d0a8ce474d17a9f4a919a57de00cd1a9f932