Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 89a5b41395  -s ours
am: bb625889e4  -s ours

Change-Id: I0f9a0ed253b77f134522533f5589ba053584888e