[automerger skipped] Merge "Import translations. DO NOT MERGE" am: a812182b2c -s ours am: cc1418a1e0 -s ours am: 420890de46 -s ours
am skip reason: subject contains skip directive

Change-Id: I2dbc921e7fe24c2f96c587e8bc188d098edbb7e1