Import translations. DO NOT MERGE am: 1e7141667f  -s ours
am: df37d62628  -s ours

Change-Id: Ic40bef3a9a5a8d9797493ce274b042009056e8d4