Import translations. DO NOT MERGE am: 6cf2d99816
-s ours am: cc298f9ae6
-s ours
am: 821967eca5
-s ours
Change-Id: I5fa9fbca513f35b554126b8a86536c68dcbdf7d0
This commit is contained in: