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

Change-Id: I49c9625202e11ce949838b798a523a21bb56fcec