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

Change-Id: I9b9d6c0eb0c4feeff169ad05c3f956870b828218