Import translations. DO NOT MERGE am: d97fb6b4fd  -s ours
am: d282fd4fbc  -s ours

Change-Id: I342386349066031e3eb177823879798cf4d9efb9