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

Change-Id: Id582294a639c1037f1f87b4f04ae2d79061e5e57