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

Change-Id: Ifea9af76e490aafd88aabea7515a69de7e3e2301