Import translations. DO NOT MERGE am: a8afcaf508  -s ours
am: dc4dc4f260  -s ours

Change-Id: I22af24cf640c01b8c118d449bbd73ce327e1ddff