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

Change-Id: I6cd0be329d2ec06d4d38781997579989c9545562