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

Change-Id: Id63df8b303b8bba84aadc3b476b579c208cc8f4a