Import translations. DO NOT MERGE am: bfb4048082  -s ours am: fa1cfd3258  -s ours
am: 47809c3c1d  -s ours

Change-Id: Ifcefa0c35294e516154a36a7b41f86fd6a95c25d