Import translations. DO NOT MERGE am: db68fc320f  -s ours
am: b33b8c9081  -s ours

Change-Id: I06f626486bc7c15d769a30e1111cd4bf82740915