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

Change-Id: I6d720a3774a9b47f946083a7d654701760ae3c21