Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 73dfb82d48  -s ours
am: 8ca1114359  -s ours

Change-Id: I7aa339ca15d39185a9980f31da9b4dbcfe887b78