Import translations. DO NOT MERGE am: d4bdbc314b -s ours am: d47bc2f25c -s ours
am: ec97386557 -s ours
Change-Id: I48013c9389dff6dbd1f7b0f8f7357b701f230aad
This commit is contained in: