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

Change-Id: I2eeb87bd30a8d440603d78b6b6583e7aa2129410