Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417  -s ours
am: efa89be550  -s ours

Change-Id: I5706d06d3c022bf56c9f7f6a5c2a6ebc8a80646c