Import translations. DO NOT MERGE am: 4ae03656ac -s ours am: ae3ec3984d -s ours
am: d44a01ba45 -s ours
Change-Id: I103cc64e34aaac7afe85d8b750a903c181cd6c82
This commit is contained in: