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

Change-Id: Ia69bc259d19b21b2099c6e239a93f2b64e72b626