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

Change-Id: I494a50f37bc0ae4d4d7979756fc067f575057224