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

Change-Id: Ic7a2c6da5ed6feb7800078eea55ef8458ff3c3b7