Android CTS 6.0 Release 21 (4214424)
am c9d7506c: (-s ours) Import translations. DO NOT MERGE

* commit 'c9d7506ceda21c53f64e55412016a452fefff1bb':
  Import translations. DO NOT MERGE