Import translations. DO NOT MERGE am: 45779af080  -s ours am: 49af78ff0b  -s ours
am: 4f8a9145e9  -s ours

Change-Id: I91f474b3052735ec607962c77572f8e3914855e3