Import translations. DO NOT MERGE am: a8c56ae30f  -s ours
am: 156b11cfc7  -s ours

Change-Id: I93596ee5a055f7e154ed355e16377ccd67c43bc5