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

Change-Id: I32cb631e3fc22caaad64403f3a13852b0d9ec18e