Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c168312e92  -s ours
am: 0911a97fc2  -s ours

Change-Id: Ifa5d3eca8a9fbcd614faa63bedf8f76d2bfcf926