Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ec4fe2a0c6  -s ours
am: 9bbae65730  -s ours

Change-Id: I8bfc1c7deae26de59f12788b5b4cd31b92212eb4