Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 7cf67d843c  -s ours am: cb19e71124  -s ours
am: 70dfb95cf5  -s ours

Change-Id: I838480d4dc3e256fe0ace05c495b588d23929b08