[automerger skipped] Import translations. DO NOT MERGE am: 835fe035b8 -s ours am: 6d3c3dba3f -s ours

am skip reason: subject contains skip directive

Change-Id: If54fd8715dae5e28df4f44c179d3f1a8ed14df04