Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5770cc3c21  -s ours am: b712d61315  -s ours
am: 641a470843  -s ours

Change-Id: I7cf89e650005871658ae2247374ac95d62247206