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

Change-Id: Icccd88323a5df358656e263c422f55591d1947bc