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

Change-Id: I5fda53091d9492b3fc7581a3528f94800d5fd58e