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

Change-Id: Ieef28579af4ac0f7fb3431c8cc72416c3bf40484