Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a  -s ours
am: 92ac9041c1  -s ours

Change-Id: I905cc7cc9acbf5cc97d35cea376c0a5d83fcd335