Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 76116a45b7  -s ours
am: 593bf07724  -s ours

Change-Id: Ic19affac57005e7f2f066f3d5899e4fe5bedf05b