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

Change-Id: Iedb86493d4620156646ebc71435cdb8323503231