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

Change-Id: I65c915a26923287d6097a374d48f7d34a892f992