Import translations. DO NOT MERGE am: 5fc22b92d2  -s ours
am: 04d29c1e08  -s ours

Change-Id: Id938c1a240fbcddd17c6b3c48fc71f9ee8ae9b1d