Import translations. DO NOT MERGE am: cf9a807e7e  -s ours am: d943567007  -s ours
am: b0998a8837  -s ours

Change-Id: I2b41f120c6331c40ed9d78f32e073d8fdaa4dd8a