[automerger skipped] Import translations. DO NOT MERGE
am: a3945ace06  -s ours

Change-Id: I69a6a47702c20d3707ced2898e6ab3919e6dd238