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

Change-Id: I4a31befc5708c063dfcee876db69476aa12157d2