Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ee4e599681  -s ours am: e68c2dfce9  -s ours
am: 6fe04c5d20  -s ours

Change-Id: If7d333f0411dbf55cba117431b0ff7b38218532c