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

Change-Id: Ifb3d5693ccd59babe6855ce13ce018e489cb9f89