[automerger skipped] Import translations. DO NOT MERGE am: 924b6b462f -s ours am: e1f9251be0 -s ours
am: a807630d1d -s ours
am skip reason: subject contains skip directive

Change-Id: Ia085ccbbc4cbf99c00ce78525d62095ea736f1ca