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

Change-Id: Ibd0f50760fbc66b1b1ea2228c1b80078b583d406