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

Change-Id: I3d164df6c1c74d0037122328abf56faa7aea36ee