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

Change-Id: Ia30f6cfcc7f7aa54ce3dab4e0f6cdbc75f75204f