Import translations. DO NOT MERGE am: 972c78b4ee  -s ours am: e87f2bbaa0  -s ours
am: 784b1cbf35  -s ours

Change-Id: I9ffd9b5af5b44dd0e9dfb0a2ee231ce619ce9d71