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

Change-Id: I570532682d6d23b49fd3d57bdaa79b438c5cb8d2