Import translations. DO NOT MERGE am: 29a7bce4e5
-s ours am: 52c0cd702c
-s ours
am: 94e485819c
-s ours
Change-Id: I0eb4dfe4e6ea190053a142f94a9c0fc93619124e
This commit is contained in: