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

Change-Id: I6f912cc088aee792eb1da8a4356cdf5c5935d160