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

Change-Id: I041d08b9e110ffb4d285139f4550d00f1521cb98