Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: ffefbfdb9d  -s ours am: 630fac14b8  -s ours
am: cfcd277022  -s ours

Change-Id: I08ea86978c0eee05d3edde8e07b332e1bb46a643