Import translations. DO NOT MERGE
am: 1e01c3e1bc  -s ours

Change-Id: I02cff5ac1acee7c268eaef68d88350cc8f420790