Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f30d524d80  -s ours am: c7ee513796  -s ours
am: f58fd65285  -s ours

Change-Id: I0ac5b0b2da31a099d22a5df1a4c32f4286a1f83a