Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 2bca12199c  -s ours
am: ecfa001cf9  -s ours

Change-Id: Ic35941aabd21a79290668dd387de4013ddc26ce2