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

Change-Id: I74ae27a7c1bab5907fedaab43072bcd4211de5ef