Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e6d2b89ce3  -s ours
am: 01d3fde036  -s ours

Change-Id: I4fd1d32c2bb9321683879d1b96623b2658cf7775