Import translations. DO NOT MERGE am: e344fd847c  -s ours am: 3c0aa4ca74  -s ours
am: f49a16ce3d  -s ours

Change-Id: Idbae5cef7120429dfa2903a3488e299b15b46fdc