sony_common : squashed merge from CM (translations and cleanup)