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

Change-Id: I215a2d1fdcb8654739221d9b00457c9584728e17