Import translations. DO NOT MERGE am: 791ebeed32  -s ours
am: fee3748d04  -s ours

Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca