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

Change-Id: I7b700b3debdca73c94793aa20d67962489bf02f7