Import translations. DO NOT MERGE
am: 54d87dc0b9  -s ours

Change-Id: I439eaf44fd09a831078eb09095fb6054c47e8d20