Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e3f5634be5  -s ours
am: 3321d3d467  -s ours

* commit '3321d3d4677c2fc2efe8180368feb0023e0bcf07':
  Import translations. DO NOT MERGE