[automerger skipped] Import translations. DO NOT MERGE
am: 2efd888e7d  -s ours

Change-Id: I9ed7acc4396a997ecf76da57394a0a63bc0f21d5