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

Change-Id: Id860b3f8409ba4d7bc810ab41d9e1c0a1e95d880