Import translations. DO NOT MERGE am: bb66b0c637  -s ours
am: 88fc8e7e62  -s ours

Change-Id: Ieb5fbc3ec55afcbe7a1ca7da2e7b58d6eda182e7