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

Change-Id: I7087d091670e16b28ee36966de18e1d5f6be5524