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

Change-Id: I6d4593dd6e87a4da1518ee4ef397b3872c58660e