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

Change-Id: I6be632590f27cfa2beefe42b4fb597a76a479cb1