Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4bac557350  -s ours am: afb631bbd3  -s ours
am: bf74388492  -s ours

Change-Id: I1d1f8480aafb0594cb8616a7ef21b9eb827f9e38