Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: aa5e02acca  -s ours am: 516d3c38bf  -s ours
am: a5fc1aae20  -s ours

Change-Id: I8e15f8b0227ba6b356454d1978550d78320c98d0