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

Change-Id: I3e1c025407e7cfa9d2185f361903817fcfabea7e