[automerger skipped] Import translations. DO NOT MERGE am: 30b9cfb2a4  -s ours
am: 2c164a79fd  -s ours

Change-Id: I8bc94f4eae465b497eb568c59c2eb88ef54afb23