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

Change-Id: Id153ec0566031b928d5087c04b03616141ab0568