Import translations. DO NOT MERGE am: a4e479afec  -s ours am: a76f80c519  -s ours
am: 84c341d366  -s ours

Change-Id: If793b1c35c2abb9662cb7f49a7ffa38b990c760d