Import translations. DO NOT MERGE am: b6c7b5d4c2  -s ours am: a324dd45e7  -s ours
am: c19984d74b  -s ours

Change-Id: Ie28c383585aa6b851a0b6256acb308491463aac9