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

Change-Id: I6ca229adb7940b9e165159aacb19aa3576394a8c