Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e4f2ebbd25  -s ours am: bbf4ba81ac  -s ours
am: 648a3e4165  -s ours

Change-Id: I35dbd45f42cc14c720c31959dc7ed5434c60cbc3