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

Change-Id: I0e849c56def57379a942f50d2d1288c8164ba7c9