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

Change-Id: I4989ac93f690299f130945cc4b2ae4984974345f