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

Change-Id: Ifad6bd7584e2c530b160c10c7dc9c0ba5ed068e6