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

Change-Id: I56f66c084eb1edf8f223fd36dcacff1ddaf12633