Import translations. DO NOT MERGE am: b081f1e809  -s ours am: 43b03fbacf  -s ours am: 7e3f20e249  -s ours
am: b597ff837c  -s ours

Change-Id: I23c9353f7d29150b47822f1a524b46a835e6ba77