Android 5.1.1 release 8
am 5d47498f: (-s ours) am cd2eba3d: (-s ours) Import translations. DO NOT MERGE

* commit '5d47498f91164e39796ea8fb97c720c96da15e51':
  Import translations. DO NOT MERGE