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

Change-Id: Ib3b032b508809334f1addfc5e579d392f79b656c