Import translations. DO NOT MERGE am: 4cdc225ade  -s ours am: e665b80e18  -s ours
am: af0d9c77bd  -s ours

Change-Id: I60f1782b2a45bf063af1d5a9e1215c7978ef39bc