Import translations. DO NOT MERGE am: 8a18ea0a1d  -s ours am: c5a329d7cf  -s ours
am: ad9a1c47bb  -s ours

Change-Id: I16f663bbf87476e9cdc778c3243cd8601254ac53