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

Change-Id: I00aa5ae2a9348676fde34aff13aae685be1bff29