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

Change-Id: I97e83b1361905837d537a1aae62833fdfbbdb0e0