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

Change-Id: I36d57b476a56534f2f169abb40ef0cf012da8a59