Import translations. DO NOT MERGE am: 3bd78c2416  -s ours
am: 2f5e9c695c  -s ours

Change-Id: I2e53af5616982fb5efd83e8c2804fe38506c15f4