Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours
am: 4f294c5d90 -s ours
Change-Id: I2dd78b1c67859ccb39965f1179a1741c7edf32e3
This commit is contained in: