Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 8f59f867f9  -s ours
am: 14f8818989  -s ours

Change-Id: I6e42ae3f5cf5a704b1f3c350af378bd178ac6714