Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 0ec174802b  -s ours
am: a6b312c336  -s ours

Change-Id: I571276a308b3ca0a214182417ca99c91fd013ead