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

Change-Id: I9b23ed7b98821c73269e1f17421e2321c03c3025