Import translations. DO NOT MERGE am: 6ffd690ecf  -s ours
am: 601e3c6522  -s ours

Change-Id: I772260ef69959ec9e52c49d55a9347d89964bb21