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

Change-Id: I00e06f87ecd29895585bdfc45291c6a25e63ec10