Import translations. DO NOT MERGE
am: 6ffd690ecf  -s ours

Change-Id: I8da92aa794a45a56201db1d0c8ec7a05b7c4fe8f