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

Change-Id: I11aa12f5d72382ff00681b64f1b62c30463a4dbe