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

Change-Id: Ide1dc02bddffa5f1bbdb7df7ecd83f70e4cf49b3