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

Change-Id: I8979949845d4722a448047f31beb6fa11ff60434