Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fcec79296d  -s ours
am: 0f61118df4  -s ours

Change-Id: Ia75da12cdcb97516d47db0108d2daa9bd5e41cc8