Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 18fd5109c9  -s ours
am: 68a3e65ecd  -s ours

Change-Id: I10fac2255546543b6d52c3953dd3c0070a3544f4