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

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541