Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4aa13976be  -s ours
am: ba670b4126  -s ours

Change-Id: Icf91b0dfecd8a9f62f60b5fe5ad161b5b2e65139