Import translations. DO NOT MERGE am: dfb6ca8235  -s ours
am: b9ee1913a1  -s ours

Change-Id: I751912ee82bbbddd0f27e087a89b6fcd9c797313