Android 5.1.1 release 38
am 93ecd042: (-s ours) am 4f365804: (-s ours) Import translations. DO NOT MERGE

* commit '93ecd04243e07317990eab25411275dd584e9912':
  Import translations. DO NOT MERGE